Autogenerated HTML docs for v1.7.4
diff --git a/gitcvs-migration.html b/gitcvs-migration.html index 15f6010..3778aac 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html
@@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.2.5" /> +<meta name="generator" content="AsciiDoc 8.4.5" /> +<title>gitcvs-migration(7)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -26,10 +27,12 @@ em { font-style: italic; + color: navy; } strong { font-weight: bold; + color: #083194; } tt { @@ -71,6 +74,10 @@ margin-bottom: 0.5em; } +ul, ol, li > p { + margin-top: 0; +} + pre { padding: 0; margin: 0; @@ -84,7 +91,7 @@ } span#email { } -span#revision { +span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } @@ -104,11 +111,13 @@ padding-bottom: 0.5em; } -div#preamble, +div#preamble { + margin-top: 1.5em; + margin-bottom: 1.5em; +} div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { - margin-right: 10%; margin-top: 1.5em; margin-bottom: 1.5em; } @@ -123,6 +132,7 @@ /* Block element titles. */ div.title, caption.title { + color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; @@ -149,22 +159,33 @@ padding: 0.5em; } -div.listingblock { - margin-right: 0%; -} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } -div.quoteblock > div.content { +div.quoteblock { padding-left: 2.0em; + margin-right: 10%; } - -div.attribution { +div.quoteblock > div.attribution { + padding-top: 0.5em; text-align: right; } + +div.verseblock { + padding-left: 2.0em; + margin-right: 10%; +} +div.verseblock > div.content { + white-space: pre; +} +div.verseblock > div.attribution { + padding-top: 0.75em; + text-align: left; +} +/* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } @@ -187,13 +208,9 @@ padding: 0.5em; } -div.verseblock div.content { - white-space: pre; -} - div.imageblock div.content { padding-left: 0; } -div.imageblock img { border: 1px solid silver; } span.image img { border-style: none; } +a.image:visited { color: white; } dl { margin-top: 0.8em; @@ -202,18 +219,38 @@ dt { margin-top: 0.5em; margin-bottom: 0; - font-style: italic; + font-style: normal; + color: navy; } dd > *:first-child { - margin-top: 0; + margin-top: 0.1em; } ul, ol { list-style-position: outside; } -div.olist2 ol { +ol.arabic { + list-style-type: decimal; +} +ol.loweralpha { list-style-type: lower-alpha; } +ol.upperalpha { + list-style-type: upper-alpha; +} +ol.lowerroman { + list-style-type: lower-roman; +} +ol.upperroman { + list-style-type: upper-roman; +} + +div.compact ul, div.compact ol, +div.compact p, div.compact p, +div.compact div, div.compact div { + margin-top: 0.1em; + margin-bottom: 0.1em; +} div.tableblock > table { border: 3px solid #527bbd; @@ -225,22 +262,53 @@ tfoot { font-weight: bold; } +td > div.verse { + white-space: pre; +} +p.table { + margin-top: 0; +} +/* Because the table frame attribute is overriden by CSS in most browsers. */ +div.tableblock > table[frame="void"] { + border-style: none; +} +div.tableblock > table[frame="hsides"] { + border-left-style: none; + border-right-style: none; +} +div.tableblock > table[frame="vsides"] { + border-top-style: none; + border-bottom-style: none; +} -div.hlist { + +div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } -div.hlist td { - padding-bottom: 5px; +div.hdlist tr { + padding-bottom: 15px; } -td.hlist1 { +dt.hdlist1.strong, td.hdlist1.strong { + font-weight: bold; +} +td.hdlist1 { vertical-align: top; - font-style: italic; + font-style: normal; padding-right: 0.8em; + color: navy; } -td.hlist2 { +td.hdlist2 { vertical-align: top; } +div.hdlist.compact tr { + margin: 0; + padding-bottom: 0; +} + +.comment { + background: yellow; +} @media print { div#footer-badges { display: none; } @@ -271,7 +339,24 @@ margin-left: 6em; font-size: 0.9em; } -include1::./stylesheets/xhtml11-manpage.css[] +/* Overrides for manpage documents */ +h1 { + padding-top: 0.5em; + padding-bottom: 0.5em; + border-top: 2px solid silver; + border-bottom: 2px solid silver; +} +h2 { + border-style: none; +} +div.sectionbody { + margin-left: 5%; +} + +@media print { + div#toc { display: none; } +} + /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -280,6 +365,7 @@ padding: 0.5em; } div.sidebar-title, div.image-title { + color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; @@ -292,8 +378,17 @@ padding: 0.5em; } -div.quoteblock-content { - padding-left: 2.0em; +div.quoteblock-attribution { + padding-top: 0.5em; + text-align: right; +} + +div.verseblock-content { + white-space: pre; +} +div.verseblock-attribution { + padding-top: 0.75em; + text-align: left; } div.exampleblock-content { @@ -304,7 +399,6 @@ /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> -<title>gitcvs-migration(7)</title> </head> <body> <div id="header"> @@ -318,24 +412,24 @@ </p> </div> </div> -<h2>SYNOPSIS</h2> +<h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> -<div class="para"><p>git cvsimport *</p></div> +<div class="paragraph"><p>git cvsimport *</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="para"><p>Git differs from CVS in that every working tree contains a repository with +<div class="paragraph"><p>Git differs from CVS in that every working tree contains a repository with a full copy of the project history, and no repository is inherently more important than any other. However, you can emulate the CVS model by designating a single shared repository which people can synchronize with; this document explains how to do that.</p></div> -<div class="para"><p>Some basic familiarity with git is required. Having gone through +<div class="paragraph"><p>Some basic familiarity with git is required. Having gone through <a href="gittutorial.html">gittutorial(7)</a> and <a href="gitglossary.html">gitglossary(7)</a> should be sufficient.</p></div> </div> <h2 id="_developing_against_a_shared_repository">Developing against a shared repository</h2> <div class="sectionbody"> -<div class="para"><p>Suppose a shared repository is set up in /pub/repo.git on the host +<div class="paragraph"><p>Suppose a shared repository is set up in /pub/repo.git on the host foo.com. Then as an individual committer you can clone the shared repository over ssh with:</p></div> <div class="listingblock"> @@ -343,12 +437,12 @@ <pre><tt>$ git clone foo.com:/pub/repo.git/ my-project $ cd my-project</tt></pre> </div></div> -<div class="para"><p>and hack away. The equivalent of <em>cvs update</em> is</p></div> +<div class="paragraph"><p>and hack away. The equivalent of <em>cvs update</em> is</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git pull origin</tt></pre> </div></div> -<div class="para"><p>which merges in any work that others might have done since the clone +<div class="paragraph"><p>which merges in any work that others might have done since the clone operation. If there are uncommitted changes in your working tree, commit them first before running git pull.</p></div> <div class="admonitionblock"> @@ -357,24 +451,24 @@ <div class="title">Note</div> </td> <td class="content"> -<div class="para"><p>The <em>pull</em> command knows where to get updates from because of certain +<div class="paragraph"><p>The <em>pull</em> command knows where to get updates from because of certain configuration variables that were set by the first <em>git clone</em> command; see <tt>git config -l</tt> and the <a href="git-config.html">git-config(1)</a> man page for details.</p></div> </td> </tr></table> </div> -<div class="para"><p>You can update the shared repository with your changes by first committing +<div class="paragraph"><p>You can update the shared repository with your changes by first committing your changes, and then using the <em>git push</em> command:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ git push origin master</tt></pre> </div></div> -<div class="para"><p>to "push" those commits to the shared repository. If someone else has +<div class="paragraph"><p>to "push" those commits to the shared repository. If someone else has updated the repository more recently, <em>git push</em>, like <em>cvs commit</em>, will complain, in which case you must pull any changes before attempting the push again.</p></div> -<div class="para"><p>In the <em>git push</em> command above we specify the name of the remote branch +<div class="paragraph"><p>In the <em>git push</em> command above we specify the name of the remote branch to update (<tt>master</tt>). If we leave that out, <em>git push</em> tries to update any branches in the remote repository that have the same name as a branch in the local repository. So the last <em>push</em> can be done with either of:</p></div> @@ -383,16 +477,16 @@ <pre><tt>$ git push origin $ git push foo.com:/pub/project.git/</tt></pre> </div></div> -<div class="para"><p>as long as the shared repository does not have any branches +<div class="paragraph"><p>as long as the shared repository does not have any branches other than <tt>master</tt>.</p></div> </div> <h2 id="_setting_up_a_shared_repository">Setting Up a Shared Repository</h2> <div class="sectionbody"> -<div class="para"><p>We assume you have already created a git repository for your project, +<div class="paragraph"><p>We assume you have already created a git repository for your project, possibly created from scratch or from a tarball (see <a href="gittutorial.html">gittutorial(7)</a>), or imported from an already existing CVS repository (see the next section).</p></div> -<div class="para"><p>Assume your existing repo is at /home/alice/myproject. Create a new "bare" +<div class="paragraph"><p>Assume your existing repo is at /home/alice/myproject. Create a new "bare" repository (a repository without a working tree) and fetch your project into it:</p></div> <div class="listingblock"> @@ -402,23 +496,23 @@ $ git --bare init --shared $ git --bare fetch /home/alice/myproject master:master</tt></pre> </div></div> -<div class="para"><p>Next, give every team member read/write access to this repository. One +<div class="paragraph"><p>Next, give every team member read/write access to this repository. One easy way to do this is to give all the team members ssh access to the -machine where the repository is hosted. If you don't want to give them a +machine where the repository is hosted. If you don’t want to give them a full shell on the machine, there is a restricted shell which only allows users to do git pushes and pulls; see <a href="git-shell.html">git-shell(1)</a>.</p></div> -<div class="para"><p>Put all the committers in the same group, and make the repository +<div class="paragraph"><p>Put all the committers in the same group, and make the repository writable by that group:</p></div> <div class="listingblock"> <div class="content"> <pre><tt>$ chgrp -R $group /pub/my-repo.git</tt></pre> </div></div> -<div class="para"><p>Make sure committers have a umask of at most 027, so that the directories +<div class="paragraph"><p>Make sure committers have a umask of at most 027, so that the directories they create are writable and searchable by other group members.</p></div> </div> <h2 id="_importing_a_cvs_archive">Importing a CVS archive</h2> <div class="sectionbody"> -<div class="para"><p>First, install version 2.1 or higher of cvsps from +<div class="paragraph"><p>First, install version 2.1 or higher of cvsps from <a href="http://www.cobite.com/cvsps/">http://www.cobite.com/cvsps/</a> and make sure it is in your path. Then cd to a checked out CVS working directory of the project you are interested in and run <a href="git-cvsimport.html">git-cvsimport(1)</a>:</p></div> @@ -426,75 +520,75 @@ <div class="content"> <pre><tt>$ git cvsimport -C <destination> <module></tt></pre> </div></div> -<div class="para"><p>This puts a git archive of the named CVS module in the directory +<div class="paragraph"><p>This puts a git archive of the named CVS module in the directory <destination>, which will be created if necessary.</p></div> -<div class="para"><p>The import checks out from CVS every revision of every file. Reportedly +<div class="paragraph"><p>The import checks out from CVS every revision of every file. Reportedly cvsimport can average some twenty revisions per second, so for a medium-sized project this should not take more than a couple of minutes. Larger projects or remote repositories may take longer.</p></div> -<div class="para"><p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional +<div class="paragraph"><p>The main trunk is stored in the git branch named <tt>origin</tt>, and additional CVS branches are stored in git branches with the same names. The most recent version of the main trunk is also left checked out on the <tt>master</tt> branch, so you can start adding your own changes right away.</p></div> -<div class="para"><p>The import is incremental, so if you call it again next month it will +<div class="paragraph"><p>The import is incremental, so if you call it again next month it will fetch any CVS updates that have been made in the meantime. For this to work, you must not modify the imported branches; instead, create new branches for your own changes, and merge in the imported branches as necessary.</p></div> -<div class="para"><p>If you want a shared repository, you will need to make a bare clone +<div class="paragraph"><p>If you want a shared repository, you will need to make a bare clone of the imported directory, as described above. Then treat the imported directory as another development clone for purposes of merging incremental imports.</p></div> </div> <h2 id="_advanced_shared_repository_management">Advanced Shared Repository Management</h2> <div class="sectionbody"> -<div class="para"><p>Git allows you to specify scripts called "hooks" to be run at certain +<div class="paragraph"><p>Git allows you to specify scripts called "hooks" to be run at certain points. You can use these, for example, to send all commits to the shared repository to a mailing list. See <a href="githooks.html">githooks(5)</a>.</p></div> -<div class="para"><p>You can enforce finer grained permissions using update hooks. See +<div class="paragraph"><p>You can enforce finer grained permissions using update hooks. See <a href="howto/update-hook-example.txt">Controlling access to branches using update hooks</a>.</p></div> </div> <h2 id="_providing_cvs_access_to_a_git_repository">Providing CVS Access to a git Repository</h2> <div class="sectionbody"> -<div class="para"><p>It is also possible to provide true CVS access to a git repository, so +<div class="paragraph"><p>It is also possible to provide true CVS access to a git repository, so that developers can still use CVS; see <a href="git-cvsserver.html">git-cvsserver(1)</a> for details.</p></div> </div> <h2 id="_alternative_development_models">Alternative Development Models</h2> <div class="sectionbody"> -<div class="para"><p>CVS users are accustomed to giving a group of developers commit access to -a common repository. As we've seen, this is also possible with git. +<div class="paragraph"><p>CVS users are accustomed to giving a group of developers commit access to +a common repository. As we’ve seen, this is also possible with git. However, the distributed nature of git allows other development models, and you may want to first consider whether one of them might be a better fit for your project.</p></div> -<div class="para"><p>For example, you can choose a single person to maintain the project's +<div class="paragraph"><p>For example, you can choose a single person to maintain the project’s primary public repository. Other developers then clone this repository and each work in their own clone. When they have a series of changes that -they're happy with, they ask the maintainer to pull from the branch +they’re happy with, they ask the maintainer to pull from the branch containing the changes. The maintainer reviews their changes and pulls them into the primary repository, which other developers pull from as necessary to stay coordinated. The Linux kernel and other projects use variants of this model.</p></div> -<div class="para"><p>With a small group, developers may just pull changes from each other's +<div class="paragraph"><p>With a small group, developers may just pull changes from each other’s repositories without the need for a central maintainer.</p></div> </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, +<div class="paragraph"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, <a href="gitcore-tutorial.html">gitcore-tutorial(7)</a>, <a href="gitglossary.html">gitglossary(7)</a>, <a href="everyday.html">Everyday Git</a>, -<a href="user-manual.html">The Git User's Manual</a></p></div> +<a href="user-manual.html">The Git User’s Manual</a></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> -<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> +<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite.</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-18 23:57:05 UTC +Last updated 2010-01-21 17:44:19 UTC </div> </div> </body> 